From 700e9e03c5a70f27172838b3da516e9bc4cccbb5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 28 May 2019 22:35:07 +0000 Subject: [PATCH] stack: Make final --- gtk/gtkstack.c | 10 ++++++++++ gtk/gtkstack.h | 16 ---------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index 0affae37cc..cbfccf4a8a 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -118,6 +118,15 @@ * filter events out events to the last_child widget during transitions */ +struct _GtkStack { + GtkContainer parent_instance; +}; + +typedef struct _GtkStackClass GtkStackClass; +struct _GtkStackClass { + GtkContainerClass parent_class; +}; + typedef struct { GList *children; @@ -191,6 +200,7 @@ struct _GtkStackPage { GtkWidget *last_focus; }; +typedef struct _GtkStackPageClass GtkStackPageClass; struct _GtkStackPageClass { GObjectClass parent_class; }; diff --git a/gtk/gtkstack.h b/gtk/gtkstack.h index 8f67b889c2..dad047efdc 100644 --- a/gtk/gtkstack.h +++ b/gtk/gtkstack.h @@ -34,23 +34,15 @@ G_BEGIN_DECLS #define GTK_TYPE_STACK (gtk_stack_get_type ()) #define GTK_STACK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK, GtkStack)) -#define GTK_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK, GtkStackClass)) #define GTK_IS_STACK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK)) -#define GTK_IS_STACK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK)) -#define GTK_STACK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK, GtkStackClass)) typedef struct _GtkStack GtkStack; -typedef struct _GtkStackClass GtkStackClass; #define GTK_TYPE_STACK_PAGE (gtk_stack_page_get_type ()) #define GTK_STACK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_STACK_PAGE, GtkStackPage)) -#define GTK_STACK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_STACK_PAGE, GtkStackPageClass)) #define GTK_IS_STACK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_STACK_PAGE)) -#define GTK_IS_STACK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_STACK_PAGE)) -#define GTK_STACK_PAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_STACK_PAGE, GtkStackPageClass)) typedef struct _GtkStackPage GtkStackPage; -typedef struct _GtkStackPageClass GtkStackPageClass; typedef enum { GTK_STACK_TRANSITION_TYPE_NONE, @@ -78,14 +70,6 @@ typedef enum { GTK_STACK_TRANSITION_TYPE_ROTATE_LEFT_RIGHT } GtkStackTransitionType; -struct _GtkStack { - GtkContainer parent_instance; -}; - -struct _GtkStackClass { - GtkContainerClass parent_class; -}; - GDK_AVAILABLE_IN_ALL GType gtk_stack_page_get_type (void) G_GNUC_CONST; -- 2.30.2